Autogenerated HTML docs for v1.5.2-rc2-46-g4675
diff --git a/user-manual.html b/user-manual.html index 43fc75d..7bcf89c 100644 --- a/user-manual.html +++ b/user-manual.html
@@ -706,9 +706,9 @@ | | | they push V their public repo <------------------- their repo</pre><p>Now, assume your personal repository is in the directory ~/proj. We -first create a new clone of the repository:</p><div class="literallayout"><p>$ git clone --bare proj.git</p></div><p>The resulting directory proj.git will contains a "bare" git -repository—it is just the contents of the ".git" directory, without -a checked-out copy of a working directory.</p><p>Next, copy proj.git to the server where you plan to host the +first create a new clone of the repository:</p><div class="literallayout"><p>$ git clone --bare ~/proj proj.git</p></div><p>The resulting directory proj.git contains a "bare" git repository—it is +just the contents of the ".git" directory, without a checked-out copy of +a working directory.</p><p>Next, copy proj.git to the server where you plan to host the public repository. You can use scp, rsync, or whatever is most convenient.</p><p>If somebody else maintains the public server, they may already have set up a git service for you, and you may skip to the section @@ -882,9 +882,8 @@ branch.master.merge=refs/heads/master</p></div><p>If there are other repositories that you also use frequently, you can create similar configuration options to save typing; for example, after</p><div class="literallayout"><p>$ git config remote.example.url git://example.com/proj.git</p></div><p>then the following two commands will do the same thing:</p><div class="literallayout"><p>$ git fetch git://example.com/proj.git master:refs/remotes/example/master<br> -$ git fetch example master:refs/remotes/example/master</p></div><p>Even better, if you add one more option:</p><div class="literallayout"><p>$ git config remote.example.fetch master:refs/remotes/example/master</p></div><p>then the following commands will all do the same thing:</p><div class="literallayout"><p>$ git fetch git://example.com/proj.git master:ref/remotes/example/master<br> -$ git fetch example master:ref/remotes/example/master<br> -$ git fetch example example/master<br> +$ git fetch example master:refs/remotes/example/master</p></div><p>Even better, if you add one more option:</p><div class="literallayout"><p>$ git config remote.example.fetch master:refs/remotes/example/master</p></div><p>then the following commands will all do the same thing:</p><div class="literallayout"><p>$ git fetch git://example.com/proj.git master:refs/remotes/example/master<br> +$ git fetch example master:refs/remotes/example/master<br> $ git fetch example</p></div><p>You can also add a "+" to force the update each time:</p><div class="literallayout"><p>$ git config remote.example.fetch +master:ref/remotes/example/master</p></div><p>Don't do this unless you're sure you won't mind "git fetch" possibly throwing away commits on mybranch.</p><p>Also note that all of the above configuration can be performed by directly editing the file .git/config instead of using
